diff --git a/Makefile b/Makefile
index fe76981eca3c2880566d3b88367ad0932c7cd567..53ef179b310fecb803ca716f3479652232d8e1a9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 BASE=vmAutoParentCategories
 PLUGINTYPE=system
-VERSION=1.2.1
+VERSION=1.3
 
 PLUGINFILES=$(BASE).php $(BASE).xml index.html
 
diff --git a/vmAutoParentCategories.php b/vmAutoParentCategories.php
index 77ff67274a45e5853ba6929d4cc0a19e3093242c..3fd193e99a8cdee5595001bb383f2abd3fbf8245 100644
--- a/vmAutoParentCategories.php
+++ b/vmAutoParentCategories.php
@@ -54,16 +54,17 @@ class plgSystemVMAutoParentCategories extends JPlugin {
 	}
 	function checkForRoutingTrigger() {
 		$trigger = $this->params->get('run_trigger', 'never');
+		$jinput   = JFactory::getApplication()->input;
 		// Explicit call will ALWAYS trigger
-		if (JRequest::getCmd('vmAutoParentCategories') == 'run') {
+		if ($jinput->getCmd('vmAutoParentCategories') == 'run') {
 			return TRUE;
 		}
 		if ($trigger == 'never') 
 			return FALSE;
 
-		$option = JRequest::getCmd('option');
-		$view = JRequest::getCmd('view');
-		$task = JRequest::getCmd('task');
+		$option = $jinput->getCmd('option');
+		$view = $jinput->getCmd('view');
+		$task = $jinput->getCmd('task');
 		$run = FALSE;
 		if ($option == 'com_virtuemart') {
 			if ($trigger == 'virtuemart_startpage') {
@@ -196,6 +197,7 @@ class plgSystemVMAutoParentCategories extends JPlugin {
 		}
 		$this->debugMessage(JText::sprintf('VMAUTOCATEGORIES_DEBUG_LOADCATS', count($cattree)));
 
+		// TODO: Instead of reading in all products at once, read in only one after the other
 		$products=$this->getAllProducts();
 		$this->debugMessage(JText::sprintf('VMAUTOCATEGORIES_DEBUG_LOADPRODUCTS', count($products)));
 		// First, look only at parent products
diff --git a/vmAutoParentCategories.xml b/vmAutoParentCategories.xml
index 11fa4215f20ab9145fafd25c3184913fa6f5d32e..fb421e2343d48f2528a42edfb61ffc9138821d86 100644
--- a/vmAutoParentCategories.xml
+++ b/vmAutoParentCategories.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<install version="2.0" type="plugin" group="system" method="upgrade">
+<extension version="2.0" type="plugin" group="system" method="upgrade">
 	<name>System - VM Auto Parent Categories</name>
 	<creationDate>2012-12-18</creationDate>
 	<author>Reinhold Kainhofer</author>
@@ -7,7 +7,7 @@
 	<license>http://www.gnu.org/licenses/gpl.html GNU/GPL v3+</license>
 	<authorEmail>office@open-tools.net</authorEmail>
 	<authorUrl>http://www.open-tools.net/</authorUrl>
-	<version>1.1.0</version>
+	<version>1.3</version>
 	<description>VMAUTOCATEGORIES_DESCRIPTION</description>
 
 	<files>
@@ -21,7 +21,7 @@
 	   <language tag="de-DE">de-DE/de-DE.plg_system_vmAutoParentCategories.ini</language>
 	   <language tag="de-DE">de-DE/de-DE.plg_system_vmAutoParentCategories.sys.ini</language>
 	</languages>
-<!-- 	Joomla 2.5 -->
+<!-- 	Joomla 2.5 & 3.x -->
 	<config>
 		<fields name="params">
 		
@@ -56,40 +56,5 @@
 			</fieldset>
 		</fields>
 	</config>
-	
-<!-- 	Joomla 1.5 -->
-	<params>
-		<param name="run_trigger" type="list" default="never" label="VMAUTOCATEGORIES_RUN" description ="VMAUTOCATEGORIES_RUN_DESC" >
-			<option value="never">VMAUTOCATEGORIES_RUN_NEVER</option>
-			<option value="virtuemart_startpage">VMAUTOCATEGORIES_RUN_VM_STARTPAGE</option>
-			<option value="virtuemart_products">VMAUTOCATEGORIES_RUN_VM_PRODUCTPAGE</option>
-		</param>
-		<param name="normal_products" type="list" default="nothing" label="VMAUTOCATEGORIES_NORMAL_PRODUCTS" description ="VMAUTOCATEGORIES_NORMAL_PRODUCTS_DESC" >
-			<option value="nothing">VMAUTOCATEGORIES_DO_NOTHING</option>
-			<option value="add_parents">VMAUTOCATEGORIES_ADD_PARENTS</option>
-			<option value="add_two_leaves">VMAUTOCATEGORIES_ADD_ONE_PARENT</option>
-			<option value="remove_except_leaf">VMAUTOCATEGORIES_REMOVE_EXCEPT_LEAF</option>
-		</param>
-		<param name="child_products"  type="list" default="nothing" label="VMAUTOCATEGORIES_CHILD_PRODUCTS" description ="VMAUTOCATEGORIES_CHILD_PRODUCTS_DESC" >
-			<option value="nothing">VMAUTOCATEGORIES_DO_NOTHING</option>
-			<option value="copy_parent">VMAUTOCATEGORIES_COPY_CATEGORIES_FROM_PARENT</option>
-			<option value="remove_all">VMAUTOCATEGORIES_REMOVE_ALL</option>
-			<option value="add_parents">VMAUTOCATEGORIES_ADD_PARENTS</option>
-			<option value="add_two_leaves">VMAUTOCATEGORIES_ADD_ONE_PARENT</option>
-			<option value="remove_except_leaf">VMAUTOCATEGORIES_REMOVE_EXCEPT_LEAF</option>
-		</param>
-		<param name="debug"  type="list" default="report_changes" label="VMAUTOCATEGORIES_DEBUG" description ="VMAUTOCATEGORIES_DEBUG_DESC" >
-			<option value="no_output">VMAUTOCATEGORIES_DBG_NO_OUTPUT</option>
-			<option value="report_changes">VMAUTOCATEGORIES_DBG_REPORT_CHANGES</option>
-			<option value="report_always">VMAUTOCATEGORIES_DBG_REPORT_ALWAYS</option>
-			<option value="report_no_change">VMAUTOCATEGORIES_DBG_REPORT_NO_CHANGES</option>
-			<option value="debug">VMAUTOCATEGORIES_DBG_DEBUG</option>
-			<option value="debug_no_changes">VMAUTOCATEGORIES_DBG_DEBUG_NO_CHANGES</option>
-		</param>
-	</params>
-
-</install>
-
-
-
 
+</extension>