Added support to tag