Added tracker creation