Added persistent connection support