Consistent API

Much, much nicer!