Try adding 2.0.0 support