Switch to use options set