Added infrastructure for single-point calculations.