Fix CI
Refactor - Reduce adherence to json as there exists retro-compatibility
issues with it