Adding field support for updating entries
incrementing version
Adding a null check to object