Changes to controller and persistence layer