Change variables to match new JsonAssembler