Support for multiple elements + cleanup