Update to stop unsolicited copying and mark methods as unsafe