Addendum to previous commit: Updated api wrappers