Added a separate configuration class