added WS mappings by KMY