Resolve heroku deprecation