Refectoring of Client Locaton