Additional changes need to make gTAG example to work correctly