Refactoring a little the milestone and project models