Changes for modular usability