Added connect/disconnect events