Simplified diff implementation