Adding EntityBase