Move to Noble Ape style data types