Add support for SB4 and Commerce tables