Change persistence to use string instead of guid