Improve interface with convenience methods
Fix naming I oversaw