Added support for external libraries