Made config conditional