Updated Controller to new interface