Fixing up plugin callbacks
Updated