Small updates for updated to entity defs during implementation