Upgraded to use latest Rails Gem