Removed the need to pass the container to Client()