Ben: switching over to factory beans for most of the bean creation