Refactored slightly the code of the Typens