Feature/more options