Added back classpath to prevent import issues