Added EOF + Operator Case Handling