Tidy up Plugin Service Request - may not need a plugin manager at all?