Feature/client context refactor