CHG: One TODO handled, introduced constants to Riemann's config creator