Changed the controller API a bit.