Added support for portable library