Feature/controller if present