Updated to use the new Milestone 1.0 definitions