Standardize type as well