Updates for Rails4