[ artf677749] 3.0 bean refactoring