Address v0.10 compatibility