Improve options resolving