moved builder config to appropriate class