Update coverage, add some new methods