Trying out a name composition
More object model cleanup and refactoring