Added v1.0.8 support