Changed desgin of Options