Use client that is passed to NewMaintainer