Added basic archetype
Cleanup