Add expanded classpath support