Added cases for options