Refactoring + FeatureContainer added