Improved SBT completion