Added modular extensibility.