Add support for alternate tag syntax