Add packaging support