Added tracker class