Added autowiring in domain bean
moved on with refactoring