Add support for tau-a and tau-b
Package tau-a/b changes