Change User to allow state metadata to be recorded