Add packaging logic