For #210 replace new() calls with beanFactory references