Added genrator tag logic to the framework