Update to the way the id is stored