Added portability