update to new 0.6-incubating api changes