Update to use internal Foundation data bindings.