Update with <element> deprecated stuff