Added support for creating tags