Better options generation