Naddara-related changes