Better options management; Using value field for data.