Update to generic