Add support for elements as output