added express/connect support