Updated connector API