Added infrastrastructure for catalytic/noncatalytic computations