Make it Rails 4 compatible