Converted to using config file