Make SB commands use generate wrappers