More plugin integration