Move sf bundle stuff to bridge