Move all configuration to Configuration class