Added get and update support