added more models for features. Feature set is now defined