Move non common config to local config module