Update to supported types