Added 0.8 support.