Adds CRSs and options tracking