Make compatible with 0.10 API