Add tab number and rename methods