Add support for dfn