More plugin re-shaping