Changed way how the responses are returned.

For users shouldnt change anything.