diff --git a/services/UserfieldsService.php b/services/UserfieldsService.php
index e2d51e0f..1ff1e417 100644
--- a/services/UserfieldsService.php
+++ b/services/UserfieldsService.php
@@ -38,17 +38,17 @@ class UserfieldsService extends BaseService
 			throw new \Exception('Entity does not exist or is not exposed');
 		}
 
-		return $this->Database->userfields()->where('entity', $entity)->orderBy('name')->fetchAll();
+		return $this->getDatabase()->userfields()->where('entity', $entity)->orderBy('name')->fetchAll();
 	}
 
 	public function GetField($fieldId)
 	{
-		return $this->Database->userfields($fieldId);
+		return $this->getDatabase()->userfields($fieldId);
 	}
 
 	public function GetAllFields()
 	{
-		return $this->Database->userfields()->orderBy('name')->fetchAll();
+		return $this->getDatabase()->userfields()->orderBy('name')->fetchAll();
 	}
 
 	public function GetValues($entity, $objectId)
@@ -58,7 +58,7 @@ class UserfieldsService extends BaseService
 			throw new \Exception('Entity does not exist or is not exposed');
 		}
 
-		$userfields = $this->Database->userfield_values_resolved()->where('entity = :1 AND object_id = :2', $entity, $objectId)->orderBy('name')->fetchAll();
+		$userfields = $this->getDatabase()->userfield_values_resolved()->where('entity = :1 AND object_id = :2', $entity, $objectId)->orderBy('name')->fetchAll();
 		$userfieldKeyValuePairs = array();
 		foreach ($userfields as $userfield)
 		{
@@ -75,7 +75,7 @@ class UserfieldsService extends BaseService
 			throw new \Exception('Entity does not exist or is not exposed');
 		}
 
-		return $this->Database->userfield_values_resolved()->where('entity', $entity)->orderBy('name')->fetchAll();
+		return $this->getDatabase()->userfield_values_resolved()->where('entity', $entity)->orderBy('name')->fetchAll();
 	}
 
 	public function SetValues($entity, $objectId, $userfields)
@@ -87,7 +87,7 @@ class UserfieldsService extends BaseService
 
 		foreach ($userfields as $key => $value)
 		{
-			$fieldRow = $this->Database->userfields()->where('entity = :1 AND name = :2', $entity, $key)->fetch();
+			$fieldRow = $this->getDatabase()->userfields()->where('entity = :1 AND name = :2', $entity, $key)->fetch();
 
 			if ($fieldRow === null)
 			{
@@ -96,7 +96,7 @@ class UserfieldsService extends BaseService
 
 			$fieldId = $fieldRow->id;
 
-			$alreadyExistingEntry = $this->Database->userfield_values()->where('field_id = :1 AND object_id = :2', $fieldId, $objectId)->fetch();
+			$alreadyExistingEntry = $this->getDatabase()->userfield_values()->where('field_id = :1 AND object_id = :2', $fieldId, $objectId)->fetch();
 			if ($alreadyExistingEntry) // Update
 			{
 				$alreadyExistingEntry->update(array(
@@ -105,7 +105,7 @@ class UserfieldsService extends BaseService
 			}
 			else // Insert
 			{
-				$newRow = $this->Database->userfield_values()->createRow(array(
+				$newRow = $this->getDatabase()->userfield_values()->createRow(array(
 					'field_id' => $fieldId,
 					'object_id' => $objectId,
 					'value' => $value
@@ -118,9 +118,9 @@ class UserfieldsService extends BaseService
 	public function GetEntities()
 	{
 		$exposedDefaultEntities = $this->getOpenApiSpec()->components->internalSchemas->ExposedEntity->enum;
-		
+
 		$userentities = array();
-		foreach ($this->Database->userentities()->orderBy('name') as $userentity)
+		foreach ($this->getDatabase()->userentities()->orderBy('name') as $userentity)
 		{
 			$userentities[] = 'userentity-' . $userentity->name;
 		}