Reinstate PrototypeBuilder and extend ArchetypeBuilder