Add support for definitions