Changed getOrElse type