changed JSON object mapping