Final changes, work with Rails 4 now