fix deprecations; Include any datasets from loaded extensions