EntityFactory now uses HBT instead of strings.