Adds library support for client