Adds support for update and delete