Updated generate/controller