Added more annotations for when options