Refactor according to [this](https://gist.github.com/ayoubzulfiqar/9f1a34049332711fddd4d4b2bfd46096) Use the 1st structure