Update to latest plugin factory