Added ability to set defaultPackage and defaultSubpackage for cli usage