Entity setup almost done