Add User spec
remove identity_spec