Refine transition from Graph to Builder