Updated class path and support lib