Added MandatoryFeature and OptionalFeature