Adding tracking code support

Signed-off-by: JWhy <jwhy@jwhy.de>