Update for portability