Created better connect/disconnect events