Support Archetype Extensibility

Based on patches originally by Benjamin Kampmann