Update conn_man

Added some checks and new features