Builder refacrtoring