Add types and type calculations.