Add support for extracting definitions