Use updated Sinatra support