Add ZTF and TOO