Added client and server to the library itself