MOD: Improve validation