Adding Entity Classes