Add support for activesupport > 3