added support for 'data' elements