Re-work the returned data
Add support for user avatar