Added ability to mask restricted key values