Added multi-tab and group support.