Vintage 2.0 support