Updated to use config objects