Add controller and generator