Refactored to a config file