More flexible builder version