Vinegar plugin and updates to mappings