Added classpath discovery