Working on controller API