Added initial package creation logic