KFSPTS-3599 Add validation, add missing field