Updated for 0.9 release