Made modular consistent with basic archetype.