diff --git a/roofis2/roomservice/admin.py b/roofis2/roomservice/admin.py
index 5ef9967..b871638 100644
--- a/roofis2/roomservice/admin.py
+++ b/roofis2/roomservice/admin.py
@@ -1,5 +1,6 @@
 from django.contrib import admin
-from .models import Staff, Room, RoomType, BookingGroup, Booking, Equipment, Location, Buildings, NumEquipment
+from .models import Staff, Room, RoomType, BookingGroup, Booking, Equipment, Location, Building, NumEquipment, \
+    AccessPoint
 
 # Register your models here.
 admin.site.register(Staff)
@@ -9,5 +10,6 @@ admin.site.register(BookingGroup)
 admin.site.register(Booking)
 admin.site.register(Equipment)
 admin.site.register(Location)
-admin.site.register(Buildings)
+admin.site.register(Building)
 admin.site.register(NumEquipment)
+admin.site.register(AccessPoint)
diff --git a/roofis2/roomservice/models.py b/roofis2/roomservice/models.py
index dd6c465..7f2a5f7 100644
--- a/roofis2/roomservice/models.py
+++ b/roofis2/roomservice/models.py
@@ -10,7 +10,7 @@ class Location(models.Model):
         return '{}'.format(self.name)
 
 
-class Buildings(models.Model):
+class Building(models.Model):
     name = models.CharField(max_length=16)
     location = models.ForeignKey(Location, on_delete=models.CASCADE)
 
@@ -42,7 +42,7 @@ class Staff(models.Model):
 
 
 class Room(models.Model):
-    building = models.ForeignKey(Buildings, on_delete=models.CASCADE)
+    building = models.ForeignKey(Building, on_delete=models.CASCADE)
     room_number = models.CharField(max_length=16)
     capacity = models.IntegerField()
     seating = models.BooleanField()
@@ -52,6 +52,8 @@ class Room(models.Model):
     floor = models.SmallIntegerField()
     admin = models.ForeignKey(BookingGroup, on_delete=models.SET_DEFAULT, default=1)
     service_staff = models.ForeignKey(Staff, on_delete=models.PROTECT)
+    latitude = models.FloatField()
+    longitude = models.FloatField()
 
     def __str__(self):
         return '{} - {}'.format(self.building.name, self.room_number)
@@ -91,3 +93,11 @@ class Booking(models.Model):
     def __str__(self):
         return '{} - {} - {}'.format(self.room.room_number, self.start_date.strftime('%Y - %m - %d'),
                                      self.end_date.strftime('%Y - %m - %d'))
+
+
+class AccessPoint(models.Model):
+    mac_address = models.CharField(max_length=12)
+    rooms = models.ManyToManyField(Room)
+
+    def __str__(self):
+        return '{}'.format(self.mac_address)