Feature/direct client communication