#10 - refactoring of bean responsibilities.