migrate to new style entities