Switch client setup to a singleton