Restructure to make the dependency on SBP less error prone