__Map for WS-524