Refined map builder workflow