Using config settings, updated factory