More changes to library and pager