Option improvements