diff --git a/autoload.php b/autoload-with-laser-cannon.php
similarity index 66%
copy from autoload.php
copy to autoload-with-laser-cannon.php
index 58a888a..2505b73 100644
--- a/autoload.php
+++ b/autoload-with-laser-cannon.php
@@ -1,23 +1,30 @@
 <?php
 # Boz-MW - Another MediaWiki API handler in PHP
-# Copyright (C) 2018 Valerio Bozzolan
+# Copyright (C) 2018, 2019, 2020, 2021 Valerio Bozzolan
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 # GNU Affero General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-spl_autoload_register( function( $name ) {
-	$path = __DIR__ . DIRECTORY_SEPARATOR . 'include' . DIRECTORY_SEPARATOR . "class-$name.php";
-	if( is_file( $path ) ) {
-		require $path;
-	}
-} );
+/**
+ * Complete autoload (with functions)
+ *
+ * This is useful if you like to create bots.
+ *
+ * If you love creating frameworks instead, see the 'autoload.php'.
+ */
+
+// autoload the classes
+require __DIR__ . '/autoload.php';
+
+// load some functions
+require __DIR__ . '/include/functions.php';
diff --git a/autoload.php b/autoload.php
index 58a888a..5d014cd 100644
--- a/autoload.php
+++ b/autoload.php
@@ -1,23 +1,34 @@
 <?php
 # Boz-MW - Another MediaWiki API handler in PHP
-# Copyright (C) 2018 Valerio Bozzolan
+# Copyright (C) 2018, 2019, 2020, 2021 Valerio Bozzolan
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 # GNU Affero General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
+/**
+ * Minimal autoload (without functions)
+ *
+ * This is useful if you like creating frameworks.
+ *
+ * If you love creating bots instead, see the 'autoload-with-laser-cannon.php'.
+ */
+
+/**
+ * Autoload classes on-demand
+ */
 spl_autoload_register( function( $name ) {
-	$path = __DIR__ . DIRECTORY_SEPARATOR . 'include' . DIRECTORY_SEPARATOR . "class-$name.php";
+	$path = __DIR__ . "/include/class-$name.php";
 	if( is_file( $path ) ) {
 		require $path;
 	}
 } );
diff --git a/autoload.php b/include/functions.php
similarity index 57%
copy from autoload.php
copy to include/functions.php
index 58a888a..935b25a 100644
--- a/autoload.php
+++ b/include/functions.php
@@ -1,23 +1,37 @@
+#!/usr/bin/php
 <?php
-# Boz-MW - Another MediaWiki API handler in PHP
-# Copyright (C) 2018 Valerio Bozzolan
+# boz-mw - Another MediaWiki API framework
+# Copyright (C) 2019, 2020, 2021 Valerio Bozzolan
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 # GNU Affero General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-spl_autoload_register( function( $name ) {
-	$path = __DIR__ . DIRECTORY_SEPARATOR . 'include' . DIRECTORY_SEPARATOR . "class-$name.php";
-	if( is_file( $path ) ) {
-		require $path;
-	}
-} );
+/**
+ * Shortcuts very useful when you are creating a bot
+ */
+
+/**
+ * Get a single wiki from its UID
+ *
+ * Some known UIDs:
+ *  wikidatawiki - Wikidata
+ *  commonswiki  - Wikimedia Commons
+ *  metawiki     - Meta-wiki
+ *  itwiki       - Wikipedia (it)
+ *
+ * @param string $uid
+ * @return mw\StaticSite
+ */
+function wiki( $uid ) {
+	return \web\MediaWikis::findFromUID( $uid );
+}