Org Entity Beefed up