added first subpkg support