Moving constants out of default config