Added update functionality, still need to fix object properties