#50 - Improved JSON export