Add controller support