Updating admin generator controllers to work with the latest pr