Modified library loading