Added some modular functionality