Separate type number and type id