Feature/refactor embedded in root associations