Updated to v0.16