Fixed support for Async and Websockets and backward compatibility