Typing mapping (8/29)

Typing mapping