Add support for transChoice