Switched over to more flexible element structure