Added external libraries support