Adding support for new void tab