Issue 9 : Archetype, cleand up.