Add support for simple controllers