Major refactoring of Typing, still on going