diff --git a/Moose Development/Moose/Ops/FlightControl.lua b/Moose Development/Moose/Ops/FlightControl.lua
index ded207415..58b7c11ae 100644
--- a/Moose Development/Moose/Ops/FlightControl.lua	
+++ b/Moose Development/Moose/Ops/FlightControl.lua	
@@ -1481,7 +1481,7 @@ end
 function FLIGHTCONTROL:_PlayerRequestParking(groupname)
 
   -- Get flight group.
-  local flight=_DATABASE:GetFlightGroup(groupname)
+  local flight=_DATABASE:GetOpsGroup(groupname)
   
   if flight then
   
@@ -1535,7 +1535,7 @@ end
 function FLIGHTCONTROL:_PlayerRequestInfoATIS(groupname)
 
   -- Get flight group.
-  local flight=_DATABASE:GetFlightGroup(groupname)
+  local flight=_DATABASE:GetOpsGroup(groupname)
   
   if flight then
   
@@ -1725,7 +1725,7 @@ function FLIGHTCONTROL:_PlayerRequestTaxi(groupname)
   MESSAGE:New("Request taxi to runway", 5):ToAll()
   
     
-  local flight=_DATABASE:GetFlightGroup(groupname)
+  local flight=_DATABASE:GetOpsGroup(groupname)
   
   if flight then
     
@@ -1840,7 +1840,7 @@ function FLIGHTCONTROL:_CreateFlightGroup(group)
   self:I(self.lid..string.format("Creating new flight for group %s of aircraft type %s.", group:GetName(), group:GetTypeName()))
   
   -- Get flightgroup from data base.
-  local flight=_DATABASE:GetFlightGroup(group:GetName())
+  local flight=_DATABASE:GetOpsGroup(group:GetName())
   
   -- If it does not exist yet, create one.
   if not flight then
diff --git a/Moose Development/Moose/Wrapper/Airbase.lua b/Moose Development/Moose/Wrapper/Airbase.lua
index 6887ab79d..8db1eacf0 100644
--- a/Moose Development/Moose/Wrapper/Airbase.lua	
+++ b/Moose Development/Moose/Wrapper/Airbase.lua	
@@ -473,6 +473,13 @@ AIRBASE.MarianaIslands={
 -- @field #boolean Free This spot is currently free, i.e. there is no alive aircraft on it at the present moment.
 -- @field #number TerminalID0 Unknown what this means. If you know, please tell us!
 -- @field #number DistToRwy Distance to runway in meters. Currently bugged and giving the same number as the TerminalID.
+-- @field #string AirbaseName Name of the airbase.
+-- @field #number MarkerID Numerical ID of marker placed at parking spot.
+-- @field Wrapper.Marker#MARKER Marker The marker on the F10 map.
+-- @field #string ClientSpot Client unit sitting at this spot or *nil*.
+-- @field #string Status Status of spot e.g. AIRBASE.SpotStatus.FREE.
+-- @field #string OccupiedBy Name of the aircraft occupying the spot or "unknown". Can be *nil* if spot is not occupied.
+-- @field #string ReservedBy Name of the aircraft for which this spot is reserved. Can be *nil* if spot is not reserved.
 
 --- Terminal Types of parking spots. See also https://wiki.hoggitworld.com/view/DCS_func_getParking
 --
@@ -507,6 +514,17 @@ AIRBASE.TerminalType = {
   FighterAircraft=244,
 }
 
+--- Status of a parking spot.
+-- @type AIRBASE.SpotStatus
+-- @field #string FREE Spot is free.
+-- @field #string OCCUPIED Spot is occupied.
+-- @field #string RESERVED Spot is reserved.
+AIRBASE.SpotStatus = {
+  FREE="Free",
+  OCCUPIED="Occupied",
+  RESERVED="Reserved",
+}
+
 --- Runway data.
 -- @type AIRBASE.Runway
 -- @field #number heading Heading of the runway in degrees.
@@ -1029,6 +1047,8 @@ function AIRBASE:GetParkingSpotsTable(termtype)
 
         spot.Free=_isfree(_spot) -- updated
         spot.TOAC=_spot.TO_AC    -- updated
+        spot.AirbaseName=self.AirbaseName
+        spot.ClientSpot=nil  --TODO
 
         table.insert(spots, spot)
 
@@ -1065,6 +1085,8 @@ function AIRBASE:GetFreeParkingSpotsTable(termtype, allowTOAC)
 
         spot.Free=true -- updated
         spot.TOAC=_spot.TO_AC    -- updated
+        spot.AirbaseName=self.AirbaseName
+        spot.ClientSpot=nil  --TODO
 
         table.insert(freespots, spot)