improved classpath resolution