Added lost-modified handling