Updated class Library