Added basic support for 'permanent' connections