Sync up with Werner's plugin's header