updated to entity based entries