Replace FeatureRegistry with Feature/Category classes
Add history support