added some queries ... and renamed mileStones to milestones