Add support for definition level