Adds Models
Fixes exclusion of un-annotated parameters
improvements to parameter types and return types