Refactored the base provider rules
Fixed pagination