__Map for WJ-678