[CS] Use less activesupport