Added package mapping