Adapt for new tabs manager