[TASK] Refactor validators to respect expected location