More functionality moved to the library