Updated client to perform initialization first