updated json data definitions2