Updated portability