Adding support for number elements.