Feature/controller model