Update static handler imports