Added the include_data_package option