Added dictionary and classpath