Update to allow for custom apis
Merge remote-tracking branch 'origin/master'