progress on User and Identity entities