Added support for package source