Brandon update

Updated the archetypes with the merged changes.