Added generic (no-canvas) plugin handling