Updates to attribute handling
Element updates, normalise all elements