Made changes to the library class