Removed dependency on activesupport 4.0 -v2