Added package support into template