Added ID check at modification
#17: Partial