Added support for data definitions