Added support for update (not tested yet)