Property/JSON translator refactored