Implemented modified library format to all the other classes