Update tabs and use more concise partial syntax