Improved portability