More parameterization for easier re-use.