adding initial tracker support