updated to match new Entity interface