Updated for latest version of 0.9