wip
Refactor fill values for multiple entities.