Added support for better handling libs