Rules parsing updated