Classpath setup changes