Added ability to select options dynamically