Config logic changed