Added BGP building utilities