better use of dic for VCS and Tracker classes - fix errors