Removed dependancy on BeanFactory - can be used standalone