Added configuration class