Update to post-v0.5.8 security model