Refactoring of structure for coming additions