Generalising History Matching for Enhanced Calibration of Computer Models