Switch to using Options