Restructured and rule updates