Added User entity and updated some fields