shouldn't you move this to the Configuration class instead ?