New routing for controllers and new error handling