diff --git a/php/autoload.php b/php/autoload.php
index 91df00c..6dad8c0 100644
--- a/php/autoload.php
+++ b/php/autoload.php
@@ -7,23 +7,19 @@
 
 if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
 
-function lycheeAutoloaderModules($class_name) {
+function lycheeAutoloaderModules($class) {
 
-	$modules = array('Album', 'Database', 'Import', 'Log', 'Module', 'Photo', 'Plugins', 'Session', 'Settings');
-	if (!in_array($class_name, $modules)) return false;
+	$file = LYCHEE . 'php/modules/' . $class . '.php';
 
-	$file = LYCHEE . 'php/modules/' . $class_name . '.php';
-	if (file_exists($file)!==false) require $file;
+	if (file_exists($file)===true) require $file;
 
 }
 
-function lycheeAutoloaderAccess($class_name) {
+function lycheeAutoloaderAccess($class) {
 
-	$access = array('Access', 'Admin', 'Guest', 'Installation');
-	if (!in_array($class_name, $access)) return false;
+	$file = LYCHEE . 'php/access/' . $class . '.php';
 
-	$file = LYCHEE . 'php/access/' . $class_name . '.php';
-	if (file_exists($file)!==false) require $file;
+	if (file_exists($file)===true) require $file;
 
 }