Changes for Rules in yaml parser