Make field types consistent with Studio