Change WMClient to go to layer model