Added EntityInterface