Added Up parser and JSON