Incrementally add support for atom parsing to json