Updates for rails4