Refactoring
Change structure of serializable elements to JavaBean