Added code back for client library