[TASK] Relocate adding of 'required' validator