Added additional constraints for ps replication