Lot of modifications for options handling
Lot of modifications for options handling