Added field length validation check