Refactored Netbuilder integration