Implemented auto tags in policy