Refactoring the Cat API client - Part II

Matthias Noback