Added more methods, exposing library differently