WIP - Support json formatting