Move to controller and add namespace/use