Added library and library search functions