Update the return extracted data format #41

| Q                    | A
| -------------------- | ---
| Bug fix?             | n
| New feature?         | n
| BC breaks?           | y
| Checkstyle issues?   | n
| Changelog updated?   | n
| Fixed tickets        | #41