Improve possible options