Updating for 0.8/0.10 build.