Added support for embedded libraries