Added checks for dexterity and archetypes