Updated template and rake task