Added missing options validation