Added mandatory options check