TypesHatcher adapted to new factory
A few modern factory improvements