Re-enabled JSON invertability