Added new feature generation classes