Included a better way to deal with changes of existing database items