Added rules into modules & messaging feature