Typing mapping (7/29)

Typing mapping