Add current value to option
Rename client class in order to avoid confusions