Just make sure this runs over new datatypes