Some more work on feature and feature layer