Add default local location and factor out client state