Object and enum types should be defined in $defs

Object and enum types should be defined in $defs #375