placed class names in static field
Merge branch 'hotfix-tsp' into develop