Basic implementation of API results
Merge branch 'module-api'