Adding support for defs; debug messages