Add support for void tags