Add zombie client error handling
Move ConnectionManager to ConnectionFactory