Immutable beans support
Refactoring