Small modifications to cluster DB template