Streamlining generic response payload handling

Closes #535