Adds request origin
Correct missing details
Refactor client && adds quote support