Adapting to 0.10

Adapting to 0.10