Extracted classes to client library