Slight modifications of the Request and Response definitions
Merge branch 'feature-messagetypes' into develop