[PLT-341] Refactored to use validate method