Option.js improvement