Work on model, controller & API