Returned to basic entity model with rich relationships + Sign In2