Adding in type anonymisation