More plugin changes