Make the input form more generic now that the plugin system is in place