Clean up GET/POST logic
Merge branch 'module-api'