Add controller and fix validation