Rails 4 compatibility (breaking changes)