Minor changes in order to separate tracker from app.