Classpath changes and added in support library.