Update code to 0.10