Updated to use DB rows for JSON return