Add def, resolve and pkgs