Typing mapping (10/29)

Typing mapping