Client code modification