Better diff handling