Replace zone define with xml provider
Add rich rule provider