Made masking service kills a configurable option