Added configuration classes