update to use EntityInterface