Add more features related to heroku integration