Add topic Path - code from zeroX-tj fork