Made classpath better