Added storage for figure object mapping data