Enhancements to TAB processing