Change CompareAndSwap
Make options struct private