Remove shell getter, and add client getter and setter