Control: added support for modularity