Added support for shared lib