TypeStamper separated into two classes.