Added package mode