Making Object controls more 'modular'