Updated with new client dependency