Updates to build nice JSON