Made client optional