Add stuffs for heroku
Add begin - rescue