More structure for calibration and reconstruction