Added support for Tags Field