Added configuration option for managing client_id keys