Changing class Element to fit new implementation of data flow