Extend Api methods

Untested