Improvement to Consumes Deserialization

Related: #713 and #657
There is no behavior to be changed, it's a class with a bunch of getters and setters only ;)
so, no much gain.
I'd do this in another PR.