More work on JSON reader