Now with more Heroku compatibility