Add controller support (why not?)