Enhance package creation