Fixed bug DATA-1

Added ClientDataManager functions