Add more methods and improve docs