Updated configuration and client methods