Decouple validator even more