Started work on rules and relations extensions