Also add year range support for SISIS, generalized code for
"restrictions"