Added modular functionality