Added JSON type record to distinguish types properly