added user_identity, added entry -> user relationship