Changes to accommodate derived data products