Make compatible with Connect