Adding better portability