Typing mapping (9/29)

Typing mapping