Added arbitrary expression mapping for peak data