diff --git a/_config.php b/_config.php
index 3e67361..0b6b732 100644
--- a/_config.php
+++ b/_config.php
@@ -11,8 +11,6 @@ define('DMS_DIR', 'dms');
 
 if (!file_exists(BASE_PATH . DIRECTORY_SEPARATOR . DMS_DIR)) user_error("DMS directory named incorrectly. Please install the DMS module into a folder named: ".DMS_DIR);
 
-Object::add_extension('SiteTree','DMSSiteTreeExtension');
-Object::add_extension('HtmlEditorField_Toolbar','DocumentHtmlEditorFieldToolbar');
 CMSMenu::remove_menu_item('DMSDocumentAddController');
 
 ShortcodeParser::get('default')->register('dms_document_link', array('DMSDocument_Controller', 'dms_link_shortcode_handler'));
diff --git a/_config/dmsdocument.yml b/_config/dmsdocument.yml
new file mode 100644
index 0000000..47acaf0
--- /dev/null
+++ b/_config/dmsdocument.yml
@@ -0,0 +1,13 @@
+---
+Name: dmsdocument
+After: framework/routes#coreroutes
+---
+Director:
+  rules:
+    'dmsdocument/$ID' : 'DMSDocument_Controller'
+SiteTree:
+  extensions:
+    - DMSSiteTreeExtension
+HtmlEditorField_Toolbar:
+  extensions:
+    - DocumentHtmlEditorFieldToolbar
\ No newline at end of file
diff --git a/_config/routes.yml b/_config/routes.yml
deleted file mode 100644
index e6b38ba..0000000
--- a/_config/routes.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-Name: dmsdocument
-After: framework/routes#coreroutes
----
-Director:
-    rules:
-        'dmsdocument/$ID' : 'DMSDocument_Controller'
\ No newline at end of file
diff --git a/code/DMSSiteTreeExtension.php b/code/DMSSiteTreeExtension.php
index c6d76fd..237aba7 100644
--- a/code/DMSSiteTreeExtension.php
+++ b/code/DMSSiteTreeExtension.php
@@ -70,7 +70,10 @@ class DMSSiteTreeExtension extends DataExtension {
 
 		if(class_exists('GridFieldSortableRows')) {
 			$sortableComponent = new GridFieldSortableRows('DocumentSort');
-			$sortableComponent->setUsePagination(false)->setForceRedraw(true);
+			//setUsePagenation method removed from newer version of SortableGridField.
+			if(method_exists($sortableComponent,'setUsePagination')){
+				$sortableComponent->setUsePagination(false)->setForceRedraw(true);
+			}
 			$gridFieldConfig->addComponent($sortableComponent);
 		}
 
diff --git a/code/cms/DMSDocumentAddController.php b/code/cms/DMSDocumentAddController.php
index 2834d9f..65576f0 100644
--- a/code/cms/DMSDocumentAddController.php
+++ b/code/cms/DMSDocumentAddController.php
@@ -71,7 +71,7 @@ class DMSDocumentAddController extends LeftAndMain {
 		$uploadField->setTemplate('AssetUploadField');
 		$uploadField->setRecord($page);
 
-		$uploadField->getValidator()->setAllowedExtensions(array_filter(array_merge(File::$allowed_extensions,self::$allowed_extensions)));
+		$uploadField->getValidator()->setAllowedExtensions(array_filter(array_merge(Config::inst()->get('File', 'allowed_extensions'),self::$allowed_extensions)));
 		$exts = $uploadField->getValidator()->getAllowedExtensions();
 
 		asort($exts);