[AESH-111]
changes to OptionCompleter, had to use a custom object to store data