Add code to ask class of the new Entity