Refactored the feature layer