Extend option classes for archetypes
Fix model mappings