Started adding support for masking servers