Includes type mapping