Updated changes for packaging