adding latest changes for demo connector