Make sure to pass key back with update/set