Moved configuration values into its own class