Changes for config module logic