Diff listeners moved to a new class