Added functionality to methods in library class