New methods and better documentation