Dot syntax refactoring, some ownership changes