Updated Archetypes again