Adding rules for guniconr & refactor with Vars