Removed did_change to save on DB space