adding packaging support (untested)