New film classification criteria and warnings to take effect this May