add client context hacks