- Improve our parsing so we are parsing all needed details from the json