Fixed option resolver interface