Add annotations to support explicit identification of query params, form-url-encoded params and entities (breaks build) (issue #6)