Adding Clicktracing infractructure