Move id out of user attributes, prepare for adding more metadata attributes