Add return value to get_controller