Added client options + removed clientState