Refactoring of consumer bean