Added TODO: long version of options