Refactor header/query parameter location
v0.0.3