More SoA refactoring