Updated build for packages