Removed hardcoded invoking of plugins