More classpath changes and updated support library.