Adding support for includepkgs and excludes