Added new rule modules & others