Cosmetics

Adds new feature types