Break out type vectorisation into own module