Bunch new options added