Added classpath handling