Added support for local control of controllers