Refactored clients and infrastructure.