Added guards to options