Refactor towards more knowledge in element groups