Adds support for models and body param type
Fixes specs
Merge branch 'refs/heads/pr/104'