Refactor how backfill records are created