Updated to Features 2.x