Minor improvements
Rename BodyType to PayloadType to avoid confusion with HTTP body
Update to 0.6.1