Add support for handling multiple servers/libraries