More refactoring to added object structure.