Added configuration check