Reverting changes
code hardning by making the element type know to which meta store it belongs