Adding tab capture feature