Client modifications