Update options

Issue: #1