Added options check (needs implementation)