Added controller and routing