Changes to Plug&Work