More structure moved over from SB