How to handle scope creep