Updated for changes in 0.0.17