Added user entity and updated organization entity.