@@ -5,17 +5,36 @@
 #
 
 from astropy.table import Table
+import numpy
 
 class Configuration:
     """ Describe a Configuration
     
     """
 
-    def __init__(self):
-        self.name = ''
-        self.data = None
-        self.location = None
+    def __init__(self, name='', data=None, location=None,
+                 names="%s", xyz=None, mount="alt-az"):
+
+        # Defaults
+        if data is None and not xyz is None:
+            nants = xyz.shape[0]
+            if isinstance(names, str):
+                names = [names % ant for ant in range(nants)]
+            if isinstance(mount, str):
+                mount = numpy.repeat(mount, nants)
+            data = Table(      [ names,   xyz,   mount],
+                         names=['names', 'xyz', 'mount'])
+
+        self.name = name
+        self.data = data
+        self.location = location
 
+    @property
+    def names(self): return self.data['names']
+    @property
+    def xyz(self): return self.data['xyz']
+    @property
+    def mount(self): return self.data['mount']
 
 class GainTable:
     """ Gain table with data: time, antenna, gain[:,chan,pol] columns
 
@@ -192,11 +192,24 @@ def import_visibility_from_oskar(oskar_file: str, params={}) -> Visibility:
     ra,dec = oskar_vis.phase_centre()
     a1,a2 = oskar_vis.stations(flatten=True)
 
+    # Make configuration
+    location = EarthLocation(lon = oskar_vis.telescope_lon,
+                             lat = oskar_vis.telescope_lat,
+                             height = oskar_vis.telescope_alt)
+    antxyz = numpy.transpose([oskar_vis.station_x,
+                              oskar_vis.station_y,
+                              oskar_vis.station_z])
+    config = Configuration(
+        name     = oskar_vis.telescope_path,
+        location = location,
+        xyz      = antxyz
+    )
+
     # Construct visibilities
     return Visibility(
         frequency     = [oskar_vis.frequency(i) for i in range(oskar_vis.num_channels)],
-        phasecentre   = SkyCoord(ICRS, ra=ra, dec=dec, unit=units.deg),
-        configuration = None, # ?
+        phasecentre   = SkyCoord(frame=ICRS, ra=ra, dec=dec, unit=units.deg),
+        configuration = config,
         uvw           = numpy.transpose(oskar_vis.uvw(flatten=True)),
         time          = oskar_vis.times(flatten=True),
         a1            = a1,
 
@@ -4,7 +4,7 @@
 from numpy.testing import assert_allclose
 
 from arl.skymodel_operations import SkyComponent, create_skycomponent
-from arl.test_support import create_named_configuration
+from arl.test_support import create_named_configuration, import_visibility_from_oskar
 from arl.image_operations import add_image, create_image_from_array, import_image_from_fits
 from arl.skymodel_operations import create_skymodel_from_image, add_component_to_skymodel
 from arl.visibility_operations import Visibility, create_visibility, create_gaintable_from_array
@@ -62,12 +62,17 @@ def test_visibility(self):
         times = numpy.arange(-3.0, +3.0, 3.0 / 60.0) * numpy.pi / 12.0
         freq = numpy.arange(5e6, 150.0e6, 1e7)
         direction = SkyCoord('00h42m30s', '-41d12m00s', frame='icrs')
-        vis = Visibility()
         vis = create_visibility(config, times, freq, weight=1.0, phasecentre=direction)
         print(vis.data)
         print(vis.frequency)
-        assert len(numpy.unique(vis.data['time'])) == len(times)
+        self.assertEqual(len(numpy.unique(vis.data['time'])), len(times))
 
+    def test_visibility_from_oskar(self):
+        for oskar_file in ["./data/vis/vla_1src_6h/test_vla.vis",
+                           "./data/vis/vla_grid_6h/test_vla.vis"]:
+            vis = import_visibility_from_oskar(oskar_file)
+            self.assertEqual(len(numpy.unique(vis.a1))+1, len(vis.configuration.xyz))
+            self.assertEqual(len(numpy.unique(vis.a2))+1, len(vis.configuration.xyz))
 
 if __name__ == '__main__':
     unittest.main()
@@ -335,6 +335,15 @@ def __init__(self, file_name):
         self._phase_centre = vis_header[self.VisHeader.PhaseCentre][0]['data']
         self._cross_correlation = vis_header[self.VisHeader.FlagCrossCorrelation][0]['data']
         self._auto_correlation = vis_header[self.VisHeader.FlagAutoCorrelation][0]['data']
+
+        self.telescope_path = vis_header[self.VisHeader.TelescopePath][0]['data'].tostring().decode()[:-1]
+        self.telescope_lon = vis_header[self.VisHeader.TelescopeLon][0]['data']
+        self.telescope_lat = vis_header[self.VisHeader.TelescopeLat][0]['data']
+        self.telescope_alt = vis_header[self.VisHeader.TelescopeAlt][0]['data']
+        self.station_x = vis_header[self.VisHeader.StationX][0]['data']
+        self.station_y = vis_header[self.VisHeader.StationY][0]['data']
+        self.station_z = vis_header[self.VisHeader.StationZ][0]['data']
+
         #
         # block_dims = self.data[self.Group.VisBlock][self.VisBlock.Dims]
         # for index in block_dims:
@@ -447,13 +456,10 @@ def stations(self, flatten=False):
         assert self._cross_correlation, \
             "Reading non-cross-correlation data not fully supported yet!"
 
-        # Order according to documentation is 0-1, 0-2, 0-3... 1-2,
-        # 1-3...  Auto-correlation isn't specified, but I guess we
-        # simply add 0-0, 1-1 etc in the appropriate place.
-        ac = 1-int(self._auto_correlation)
+        # Order according to documentation is 0-1, 0-2, 0-3... 1-2, ...
         station1 = numpy.repeat(numpy.arange(self.num_stations),
-                                self.num_stations - ac - numpy.arange(self.num_stations))
-        station2 = numpy.hstack([numpy.arange(start+ac, self.num_stations)
+                                self.num_stations-1 - numpy.arange(self.num_stations))
+        station2 = numpy.hstack([numpy.arange(start+1, self.num_stations)
                                  for start in numpy.arange(self.num_stations)])
         # Tile in one or two dimensions depending on whether we want a
         # flat result