Updated script for packaging