Added stuff from Rails 4 app