Added support Type and Tag functions