Updated for 0.9.8.0 release