Fixed mapping; added ProductMilestone to BuildCollections