Added management of extra libs