Add custom helmets in classes
Fixes #21