Add PKGS and FIELD support.