Updates for config move