Added remaining API methods, will create more unit tests later