Added support for update