Adding support for serverBased rules