HCOLL-119 moved the builder into chronicle map