Added classpath support