Initial Connection Handling added