Changed so controller is not having to be mapped directly