Added firstname and lastname to UserEntity