Added options

See comments