Modified model to return map containing id and data on get and update