Portability feature added