updated to use JSONAware object instead of String data