Updated classpath logic