Update for rails 4.0.0+