Add support for the defs items, add more log