Issue #211: Add support for JSON fields