Move dust-specific stuff into plugin