diff --git a/app/services/flights/service.rb b/app/services/flights/service.rb
index 20f30ce..ba4f297 100644
--- a/app/services/flights/service.rb
+++ b/app/services/flights/service.rb
@@ -36,6 +36,22 @@ def find_flight(date:,
       }.compact!
       @client.call(:airline_flight_schedules, message: message)
         &.to_hash[:airline_flight_schedules_results][:airline_flight_schedules_result][:data]
+        .map do |flight|
+        flight[:departuretime] = Time.at(flight[:departuretime].to_i)
+        flight[:arrivaltime] = Time.at(flight[:arrivaltime].to_i)
+        flight[:origin] = _get_airport_info(flight[:origin])
+        flight[:destination] = _get_airport_info(flight[:destination])
+        flight
+      end
+    end
+
+    def _get_airport_info(shortcode)
+      resp = @client.call(:airport_info, message: {airport_code: shortcode})
+      resp.to_hash[:airport_info_results][:airport_info_result]
+    end
+
+    def _get_airline_info(shortcode)
+      @client.call(:airline_info, message: {airline_code: shortcode})
     end
 
     # Converts a Time object into [8 pm night before, 4am next day] in an attempt