Add rails 4 compatibility