#1 Refactor set() to return object on update