Updated library loading

Updated library loading