Improve option validation