added Connection manager entity
change logic