No inclusion of main class in cli controller; gen updates