Add operator options
Add some sanity checks