Per-client integration support

:sparkles: