Add support for union