Added support for milestones and components