Refactoring. Wrapping the response to embed required fields.