Removed EntitySuperclass