Add support for includeDatabaseNameInPackage