Some work on making packages and dataset entries optional.