POST parameters refactor
Merge branch 'module-api'