Added keepAlive support