For reference
Refine JA and WS processing