Changed the client to use environment variables