Few enhancements to json interface