Added package mapping statics