Change where id storage happens