Support for sluggable 2.0