Replace some more hardcoded string with config