Added suffix and length checks and changed to FieldVal naming