Added update support
Added comment