Added CSOR decorator