Completed Demo setup and added new rule types