Refixed Pundit definitions