Updates to options handler