Adding support for update.Key