Updated activesupport and thor