Adding library functionality