Matching new interface.
0.2.0