Moved configuration related stuff into a configuration class