Make changes to controllers to prepare for requester introduction
Travis won't be happy, it'll be fixed once requester is added.