Better configuration, plugin support