Added validation for minimum fields