Added support for extending tags