Add Options and a design decision