Improve configuration of option resolver