Made the returned data more structured.