Client libraries section refactored