[AMC] Switching to use builders