Improved client to handle infinite keys