Fixed client and adapted all options to the new libraries.