Change to support Rails4