Added new option types