Added named criteria groups (rules)
Removed rule resolver and alias