Lot of updates for rails4