added missing subpackages