Included more of the boilerplate in the archetype