Fix db mapping; added ProductMilestone