Refactor json parsing
Refactor (lib)