Moved location back to client as it is used by multiple client types